From a52eee9e6354764457ec744063eccea278c4dccf Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 19 Mar 2025 13:31:00 +0100 Subject: [PATCH] try to force the highlight to not be too bright Signed-off-by: Matthieu Gallien --- src/gui/tray/CurrentAccountHeaderButton.qml | 7 +++++++ src/gui/tray/HeaderButton.qml | 7 +++++++ src/gui/tray/TrayFoldersMenuButton.qml | 7 +++++++ src/gui/tray/TrayWindowHeader.qml | 1 + 4 files changed, 22 insertions(+) diff --git a/src/gui/tray/CurrentAccountHeaderButton.qml b/src/gui/tray/CurrentAccountHeaderButton.qml index 061a5d2fb..4b646ed95 100644 --- a/src/gui/tray/CurrentAccountHeaderButton.qml +++ b/src/gui/tray/CurrentAccountHeaderButton.qml @@ -36,6 +36,13 @@ Button { Accessible.name: qsTr("Current account") Accessible.onPressAction: root.clicked() + palette { + text: Style.currentUserHeaderTextColor + windowText: Style.currentUserHeaderTextColor + buttonText: Style.currentUserHeaderTextColor + button: Style.adjustedCurrentUserHeaderColor + } + // We call open() instead of popup() because we want to position it // exactly below the dropdown button, not the mouse onClicked: { diff --git a/src/gui/tray/HeaderButton.qml b/src/gui/tray/HeaderButton.qml index b133a7532..ff8866e48 100644 --- a/src/gui/tray/HeaderButton.qml +++ b/src/gui/tray/HeaderButton.qml @@ -34,6 +34,13 @@ Button { icon.height: Style.headerButtonIconSize icon.color: "transparent" + palette { + text: Style.currentUserHeaderTextColor + windowText: Style.currentUserHeaderTextColor + buttonText: Style.currentUserHeaderTextColor + button: Style.adjustedCurrentUserHeaderColor + } + Layout.alignment: Qt.AlignRight Layout.preferredWidth: Style.trayWindowHeaderHeight Layout.preferredHeight: Style.trayWindowHeaderHeight diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml index f98cad514..060a167bd 100644 --- a/src/gui/tray/TrayFoldersMenuButton.qml +++ b/src/gui/tray/TrayFoldersMenuButton.qml @@ -53,6 +53,13 @@ HeaderButton { Accessible.name: tooltip.text Accessible.onPressAction: root.clicked() + palette { + text: Style.currentUserHeaderTextColor + windowText: Style.currentUserHeaderTextColor + buttonText: Style.currentUserHeaderTextColor + button: Style.adjustedCurrentUserHeaderColor + } + ToolTip { id: tooltip visible: root.hovered && !foldersMenuLoader.isMenuVisible diff --git a/src/gui/tray/TrayWindowHeader.qml b/src/gui/tray/TrayWindowHeader.qml index 3fbd8fc53..6d783dd8b 100644 --- a/src/gui/tray/TrayWindowHeader.qml +++ b/src/gui/tray/TrayWindowHeader.qml @@ -35,6 +35,7 @@ Rectangle { text: Style.currentUserHeaderTextColor windowText: Style.currentUserHeaderTextColor buttonText: Style.currentUserHeaderTextColor + button: Style.adjustedCurrentUserHeaderColor } RowLayout { -- 2.30.2